(uniquify-rationalize-file-buffer-names): If

newbuffile is nil, don't call expand-file-name on it.

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 495d893baf06d48b3975b0d37b59c4f525865d09..3bf889f099696d7bb5c0b58cc5e303e9e86014c2 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -147,7 +147,8 @@ pathname elements.  Arguments cause only a subset of buffers to be renamed."
       (while buffers
        (let* ((buffer (car buffers))
               (bfn (if (eq buffer newbuf)
-                       (expand-file-name newbuffile)
+                       (and newbuffile
+                            (expand-file-name newbuffile))
                      (uniquify-buffer-file-name buffer)))
               (rawname (and bfn (file-name-nondirectory bfn)))
               (deserving (and rawname